Properly update the style cascade on screen change

GtkStyleContext was not properly handling the style cascade when
setting a screen, causing the inspector global CSS to affect the
inspector window, even though the inspector is using a different
screen now.

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 04542d7906ef40c17eed36f2146ea20231313554..37f330d2f0ba9e1f11345aee0aabe6a9da9319ed 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -2142,6 +2142,7 @@ gtk_style_context_set_screen (GtkStyleContext *context,
 {
   GtkStyleContextPrivate *priv;
   GtkStyleCascade *screen_cascade;
+  GtkStyleCascade *old_screen_cascade;
 
   g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
   g_return_if_fail (GDK_IS_SCREEN (screen));
@@ -2151,7 +2152,8 @@ gtk_style_context_set_screen (GtkStyleContext *context,
     return;
 
   screen_cascade = _gtk_settings_get_style_cascade (gtk_settings_get_for_screen (screen));
-  if (priv->cascade == screen_cascade)
+  old_screen_cascade = _gtk_settings_get_style_cascade (gtk_settings_get_for_screen (priv->screen));
+  if (priv->cascade == old_screen_cascade)
     {
       gtk_style_context_set_cascade (context, screen_cascade);
     }